Autogenerated HTML docs for v2.33.0-rc2
diff --git a/git-log.html b/git-log.html index 2f6db39..2590e06 100644 --- a/git-log.html +++ b/git-log.html
@@ -3464,9 +3464,10 @@ <dd> <p> This option makes diff output for merge commits to be shown in - the default format. The default format could be changed using + the default format. <code>-m</code> will produce the output only if <code>-p</code> + is given as well. The default format could be changed using <code>log.diffMerges</code> configuration parameter, which default value - is <code>separate</code>. <code>-m</code> implies <code>-p</code>. + is <code>separate</code>. </p> </dd> <dt class="hdlist1"> @@ -3488,8 +3489,7 @@ <p> This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated - for each parent. This is the format that <code>-m</code> produced - historically. + for each parent. </p> </dd> <dt class="hdlist1">
